merge r14667 (#5145)
authorJo-Philipp Wich <[email protected]>
Sun, 17 May 2009 19:52:57 +0000 (19:52 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 17 May 2009 19:52:57 +0000 (19:52 +0000)
commit1ce4a34670823696c66f08ea1cdfd954d2de9863
tree196694127dd3bd645095a71fcfdb7baa78364359
parent7d76b4236109f50de669df4e9f7eb0f2d72168d3
merge r14667 (#5145)

SVN-Revision: 15905
net/samba/Makefile
net/samba/files/samba.init